From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 19 Jul 2018 21:57:19 +0000 (-0400)
Subject: Emoji chooser: Also check for hex boxes
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~33^2~30
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=078870f604d58352f38eb55d453642a0978ad0af;p=gtk%2B3.0.git

Emoji chooser: Also check for hex boxes

We don't want to see those either.
---

diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 68cabda67e..ee17ea3cf1 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -404,7 +404,8 @@ add_emoji (GtkWidget    *box,
   pango_layout_get_extents (layout, &rect, NULL);
 
   /* Check for fallback rendering that generates too wide items */
-  if (rect.width >= 1.5 * chooser->emoji_max_width)
+  if (pango_layout_get_unknown_glyphs_count (layout) > 0 ||
+      rect.width >= 1.5 * chooser->emoji_max_width)
     {
       gtk_widget_destroy (label);
       return;
@@ -654,7 +655,8 @@ gtk_emoji_chooser_init (GtkEmojiChooser *chooser)
   /* Get a reasonable maximum width for an emoji. We do this to
    * skip overly wide fallback rendering for certain emojis the
    * font does not contain and therefore end up being rendered
-   * as multiply glyphs. */
+   * as multiply glyphs.
+   */
   {
     PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (chooser), "🙂");
     PangoAttrList *attrs;